Removed a few things not really used

Change-Id: Ia61aeda4ed0ec629eceff924d1e07d6c02af3ef4