Remove possible failing optimizations