Finished bugfixes on deletes.