Removed old methods and objects