cleanup and branch rename