Drop several optimizations that don't work as is