more cleanup - ready for test by Bryan