Remove that hacky sleep, works with TmfProvider