Clean up some imports