Cleanup to change to the new presentation system