Cleanup kludge