Cleaning up subscription methods