Remove hybrid weirdness