CLDIDE-1931: remove payment system subscription on remove subscription over API; fix NPE