Improved remove legacy salt

Refs #1699