Ditch optimizations for the time being