cleanup of 2007 haiku