Ensure calculators are retained on soft delete.
Merge pull request #37 from Senjai/2-1-lav-calculator

Ensure calculators are retained on soft delete.