some cleanup for the user context