Remove dependency on check-type
Remove backwards compatibility