cleanup the last patch slightly