removed unnecessary directives in some files