clean up the last bit of manual connection management and how we expire keys