Refs #62 - Cleanup junk after merging branches