remode unused lines and review overlap