Cleaning up and merging branches