Renaming and removing obsolete code