cleanup fixes #17