general cleanup - removed a bunch of unnecessary directives