also call self.remove_endpoint(sub) OOIION-987
Merge pull request #1334 from carueda/2013-09-18_OOIION-987

also call self.remove_endpoint(sub) OOIION-987