update whetstone to use remove instead of stop

Signed-off-by: Matthew McNew <mmcnew@pivotal.io>