More work on refactoring of instantiations.
Cleanup