Removed outdated code