Remove unnecessary (and useless) “optimization”