more gratuitous cleanup