code cleanup removed directives