Further cleanup of using directives