cleanup fixes #37