Remove unnecessary codes

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