Clean up user id code