Added more cleanup