CAP-1706 cleanup and fixed ordering of version dict