2014-03-14-23.12.23: Cleaned up some of the mess left by preceding.