Revert "cmfm: secure storage and other improvements"

This reverts commit 877d4660622ebcaa992f05396237169c289470c4.