Clean up some imports that must have been auto added by intellij