Revert "dont need cm everywere and some random entropy mods"

This reverts commit 6d00500651c442325ff010cf9997a9d76d4da37d.