cleanup, fix #8