remove some stuff

Change-Id: Ie1c0783adf9656572b400ef7446578227a27518b