No need for optional function parameters

These were only used for testing. We propose using a Stop() method since
it is cleaner.

Signed-off-by: Mike Gehard <mgehard@pivotal.io>