Remove TYPE constants and its usages