remove over-optimization