Cleanup by removing needless directives