clean up some configuration stuff, dead comments, etc