Removed unused functions.
Removed dependence on deferred deleter.