Revert "Merge commit '66729111f79ad03e32b97ea2c6726c4e996bdb7a' into smem-modular"

This reverts commit 5830b96747c6fcc466650a88cd945c33a73f46eb.
More fixes to slowly get to a compiling smem replacement
More updates