Moar cleaning

Change-Id: Ibf00db5980c24ea426f21681bfb890197811ad81