Cleaning up CpkContentGenerator (unused in 5.0)