Cleaning up usings