Remove lacacy reflow logic