Removed old methods and old files