LIVEOAK-577: Implement security delete, more refactor, more fixes