More on paths and cleaning up unused code