Simplify user location methods
Simplify remove_departed_users