Continue annotation viewer cleaning