more cleanup updates