Revert "another cleanup"

This reverts commit 05642ba050ec6d89b69234c5c49ed4b240210553.
otter2: update dependencies