Remove original_directory from the constructor