Adding system cleanup