Revert "Solution update and initial mash prototype"

This reverts commit 50ccfa8f9fcf2cfdbcac4962fa01bcdd358fda0a.