yay for lotsa cleanup