Refactor, removing item from folder model now unsubscribes.