Revert "Remove unused methods"

This reverts commit 48be536f8cffa4760457c30cf6bffe5a9b465f5d.
Add TODOs for untested methods