We have several instances of code that has had a deprecation warning for >1 year. We should clean up these old versions before the next release