Remove delegate.then, long overdue