[Fix #432] Remove left-over functions from s and f

Regression from fca2c54 and 5657168