less memory footprint

Change-Id: Ie0fe57865a052c611f2dda9f0d1ebe8eff49337d