Remove ref to base_dir