Merge branch 'remove_deleters' into 'master'
streamlined deleter code for optional dependencies
See merge request hej/HEJ!99