cleanup of 2006 haiku