Slimify

Change-Id: I8b0529403d91553568b3fbbab089238c5489681f