Removed outdated/unnecessary code