can this mess get cleaned up? <https://github.com/...