Revert "Missing cm/util classes"

This reverts commit 116a4d844354caffb0c5d70c5d621f55b57977f6.