Whitespace cleanup and remove non-canonical headers