cleanup of 2008 haiku