more clean-up attempts

gahhhh finding memory leaks blows the big one