[code] get rid off yapb completely