Make it slim

Change-Id: I4621c0f11d1e5deb50b236d2d3a3d8082f81b843