20140311.01 - More cleanup stuff