Preventing users from deleting themselves (#574)
Cleaning up mixins for #574