cleanup of using directives