Cleaning up metadata
removing silly not-quite-functional header style hacks