Trim

Change-Id: Idb94613a3488d5a24ac1609b91a960851dda8cc2