Cleaning up some usings