remove dependency on waigo.load