cleanup of 2009 haiku