Moved deferred tasks out of current deliverables