Remove some optimizations