Renamer cleanup