step one in removing fields filter. Tests pass.