Added border removal.