Removed old code
general cleanup