Remove extraneous start & stop calls. Fixes #26