remove internal func specifiers, fix Disposable.disposed