clean up somemore based on introduction of path.py. Missed a few