remove debug code, fix dumper to be extensible