Remove backward path building, cosmetic changes