Removed all _s_ and _r_ functions.