Remove unnecessary codes

There are some unnecessary codes in the previous version. which will obviously slow down the bench.  I removed them...

thanks