path fix and cleanup