more cleanup cont.