Clean up headers