Clean up user activity code in preparation for topic rendering