cpanfile cleanups