Remove "optimisations" (they kill perf)