Renames and removing old code