cleanup

I thought some of this was already merged....