DJ: Some code tidy up.  Removal of unneeded directives