clean up control
the ongoing campaign to remove all instances of return in client code continues'