removed the dependency on certain vhosts. Bring your own