Removing outdated code