It appears that we don't need the stub instance

Removing my fix and paring it back so that we only have one instance
object... way cleaner