fix some dumb and remove some uneeded shit

Change-Id: I2a9b7e7b6a3b82f09034f813ab35864054437976