remove buggy optimization