cleanups through 2008 and 2004 Refresh