Removed some outdated code