also call self.remove_endpoint(sub) OOIION-987


https://jira.oceanobservatories.org/tasks/browse/OOIION-987?focusedCommentId=26414&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-26414