cleanup and rebuild push