(PE-3021) Remove typesafe code, use external lib
Merge pull request #129 from cprice404/maint/master/PE-3021-remove-typesafe-code

(PE-3021) Remove typesafe code, use external lib