Clean up user context related code