Applied code diffs from OpenLinkMap, deleted some files no longer needed