#87

* clean up dependencies
Revert "#87"

This reverts commit a52a5172a135d26a5908b07a3dc3165de16e546f.
Revert "Revert "#87""

This reverts commit 15e047b7abd9d093a8427d3367b952b232d8c03f.