Remove bad optimization