Renaming
Removing old code