More fixes, add removing, remove the duplication of the lists.
More fixes, add removing, remove the duplication of the lists.

TechplexEngineer/Aurora-Sim,TechplexEngineer/Aurora-Sim,TechplexEngineer/Aurora-Sim,TechplexEngineer/Aurora-Sim