Trim redundant stuff that comes from parent image

Change-Id: I69b4e809cd0108038bf68a558265c8e801005d3f