Fix more cleanup: the sad part is that I actually did test this