Slim-ify

Change-Id: Ia6de7fac3d581e88b84a43144b1e47fbd4e7f828