small cleanups post-cd