Remove useless optimization