work on cleaning up paths