Added support for border and line removal.