Remove `type` and fix URLs
Merge pull request #223 from ZDroid/nuke_types

Remove `type` and fix URLs