A bunch of cleanups that Gabriel suggested
cleanup config too