removed the removal of the expand fields