Revert "A few small changes"

This reverts commit a10bcda9b142646b6885ba724dbda5ab6058a879.
Revert "Controller update (new PuzzleSolver agent!)"

This reverts commit c8e2f207a901c5862f17a49f3a54eb6fb1e4274c.
Revert "A new controller"

This reverts commit bbc53ecedf33c54337a2d772b9676d68a10a6d7f.
Revert "Controller update (new PuzzleSolver agent!)"

This reverts commit c8e2f207a901c5862f17a49f3a54eb6fb1e4274c.