Clarify docstrings
Add TODO for deprecation removal