Remove code specific to ubuntu testing image