Some cleanup around users, subscriptions, and constants