Rename and delete unuseful code.