Remove some obsolete FIST points (resubmit)

Same as #1118.