20140310.01 - More cleanup, plus #172 #174 #175