Remove unnecessary Deferred creation