Clean up outdated code