Cleaning up a main branch