Slimify

Change-Id: I3f1d4a862a5c46135f9ee2754f14ce09b97bde8d