clean up paths, change default term