This commit cleans the Users module.