Cleaned up UserResource, LAPPS-69