Cleaning up some imports