pcm: more cleanups