Remove unused functions from .functions.
Merge remote-tracking branch 'origin/master'