remove some unused codes

removing these unused codes is helpful for following heavy work on
benchmark scenarios.

Change-Id: Id39a7db6cbe29ddbf288b3d19e210307bfa0800b