Use Disposables rather than a remove method
Fixup docs regarding disposables