more cleanup in treatments