A bunch of cleaning to prepare the branch for a merge.