Attempt at cleaning up some imports