Adding in a cleanup option and also more aggressive cleanup steps for when we have upload turned on.