1) more cleanup