Slimify

Change-Id: Ifd7eb7a68a4d385050ac66c1f90d7b5c2a7355c3