CVB-116: Remove Payment status and Resource Type for now