cleanup
oops, fix cleanup