Cleans up some imports