more cleanup before serious changes