Remove trailing, old code
Renaming