removed more vestiges