cleanup, fixes #16