Remove non-DRY portion of stopbuffer params