*Rename & removed unused code