Remove unused code
Rename