refactor System config kill wagn.rb+discussion

I don't know how critical this is, not sure I have a great argument for benefit or ROI, I just know that I want it really badly.