[WaveParts] Cleanup

Change-Id: Iea176a6ba9626a6775cef64d60e2b57eed5ff65d