More size reduction

Change-Id: I8804c9acaaa425eaeada7a276e55fe496419cd0e