Removed old stuff, code cleanup continues