Also clear decorations when removing FS

kopareignsrequested to merge
kopareigns/fc-pregmod:fixes into pregmod-master

An addendum to !3739 (merged).

Merge request reports