Remove commented/obsolete code