SIT-523, removing fields