Cleanup, make objects hashable