removed unused things, cleanup and efficiencymaking