Clean up
Enable some headers directives