Clear up some unused imports