code refactored / cleaned up to remove old stubs that are no longer
needed due to visitors pattern