Removed extract_dir