remove CdmUtils.isEmpty and some cleanup