Github Issue # 129 - Remove extra fields and last stage in dataset addition