OSD data uptake one-offs for 2010-2012
temperature related refactoring
temperature functions clean up
temperature related cleanup
more temperature related refactoring