REFACTOR: more bit without build numbers