removed old stuff
optimized