Remove dependency on progressbar