Cleaned up some usings