Remove hacks for -O defaulting to -O2