ZSS-302: remove must remove/replace rows