Remove underscore deferred and underscore. WIP