remove some more bloat

Change-Id: I7b6c04d99c41360ff49be774afcb4447a829d31c