Remove: more assertions