Cleanup and temporary header