Removed unused directives and such