Remove check for isactive and revert back to just calling stop