Remove fixed version on CDP dependency
Upgrade to use OD 6.2
Remove optional dependencies
Upgrade Viewpoint and OD versions