Beginning to split out wave-specific puppet logic.
Yank some now-unused imports.
Bumping requirements.