[buying] started cleanup, [mapper] started rewrite