added no_path_cleanup feature for #261