Remove legacy border