Tidying up the mess I made from the merge