Cleanup + path edit