Fixing user deleting, which had an error and some redundancies
Possibly more efficient way of deleting user consents.
cleanup
Updates based on code review
Merge pull request #368 from alxdarksage/user-delete-fixes

User delete fixes