Cleanup from Upgrade of the Forum