Removed old code, now solely uses OpenData V2. Needs review