right. i propose we clean that up in a separate commit outside of this PR, ok?