Spelling fix
Remove unsubAndClose and move all those calls into the close method. Adjust all other functions to use close.