Removed resolve_path