Next rev
All unresolved symbols fixed, removing