Revert "Cleanup and POW Removal"

This reverts commit 5f9b9c0754c01ba562cf4c940e6e5614ececcbc2.