cleanup.  Some clients may need slight updating