rename and delete dead code