Cleanup, and test battery weather poll technique. Everything but the new
poll technique will definitely be merged to master.