Removing old user logic from app.
Changing when us_map executes.