remove over optimization