Cleaned up some disused import statements