Clean up some dead code and update the example config file.