Revert "Solution updates"

This reverts commit 766480a9ed02b0eaa85fbd44a2e16bcba8cf5025.