more cleanup ick