clean up + opti week_all