removing buggy optimization