- Simplified the Disposable.class #199