Model - small refactor in *.delete() methods.

Changed code flow so call to super().delete() is always
at the end of the method.

Behavior is also slightly modified, because cleanup_related_items part
is no longer activated if shortname of the item was an empty string.