More Feb 2013 cleanup