Remove duplicate expand_path