LPS-40165 Removing unused fields which break JS saving