Remove ancient workaround & fix small logic error
Remove redundant check
Add missing obtype