Add destroy_with_password method
Remove unnecessary code
Merge pull request #2392 from michiel3/master

Add destroy_with_password method