Remove unused code from CMISUtil, fix null annotation.