remove old PATH stuff, shovel some code around