More size reduction

Change-Id: I641e1596f96a88e22f5e921946ed926927e0a045