Remove subscription methods + tests added