Remove unused function
rename and clean