[2010 -> 2013] Clean the merge from 2010 to 2013. Mark obsolete some future unused class. Partial passing stylecop.