Optimized and cleaned