Remove some trash

Change-Id: I75e49a7f82dd25db603edbb502c3a122e7d0cca7