removing some unused code

Change-Id: Ied4d7d4661a65ba9320fcb3d58ae181e22d53869