Remove original_directory and original_extension

Does not make sense anymore to have this.