Removed old/unnecessary code