removing issues, some changes to subscriptions