20140321.02 - cleanup