Cleaning up headers