Removed some imports that caused warnings