Merge "Tidy up unused/badly named headers"