cleanups

- resolves #94