method: Remove unused methods

Álvaro discovered that these weren't really used, so remove
dead code and consolidate the remaining into the only call site.

Change-Id: I907179b6e175d4f543fb106fcc65a19a6b8cf279