CleanUp methods added to Directives