Updated user find
Removed unused mappings