Replace then()'s with done()'s