Slim down

Change-Id: I4dcaec3adc4cc38c118d7d055fe8f44a3560d98e