remove some stuff

Change-Id: I4987f6690df9c633eef7a4f87a1d99d6d06dc5a2