Clean up Viewer code after merging in viewerEntityMixin.