9/12/2013 - SRH
Final cleanup commit