Remove TYPE constants all together
Merge pull request #991 from tomaszdurka/issue-991

Remove TYPE constants and its usages