Unused functions break the -Werror build. Revert for now.