Trim... trim... trim

Change-Id: I2e26cb49c5b16210d4d35dc1b67ddfc8ce24e819