Clean up a few things.
Remove the defunct evaluation code.