fix #1381 cleanup gingerbread removal

fix #1381 cleanup gingerbread removal