Challenge supply cleanup