remove debug code + wrap all scope handler