Add better return for clean system