20140306.02 - more cleanup  stuff