Remove temp data after run completion, add generic household demand mode