Clean up some usings.