Remove dependency on KmbPuppet and KmbServers