Removing the messed up call to done();