add unit/data_type management, remove old bits