and removed old stuff not needed anymore