Clean up usings