Clean-up of directives part 1
Clean-up of directives