Remove defer/advanceReadiness