Get rid of useless intermediary Data Type constants