Make it slim

Change-Id: Iddae78d8bcb3434f9baeb425d6a2b292e09c4a13