wave: clean-up and match android's recommended config