wave: 2nd config clean-up