Drop dead code
Delete mappings when user is removed
Use update instead of remove/add