remove rename and remove function