fixes to removeCell handling