more cleanup for rename