20131014.5 - more cleanup