Simplify some code and remove unused code

Also fixed a bug where a couple of state variables were not being saved
to disk, which was preventing a warning message from appearing when
broctl detects a new bro version.