Remove possibly useless stops