Refactor(all files) removed unused directives