HUGE COMMIT : code cleaning circulation.