Removed all traces of base_directory (and friends)