Cleaning up header keys