update sizes and remove remnants of shape