Refacto storage for auto clean