Yet more refactoring of internals

Removed IVertex