removed unused code
rename