some more necessary cleanup