Bugfixes: More Delete Bugfixes