Remove unused functions (see previous commit)