fix bug and missed commits
missed deletes