cleanup
pathmapping fixed