removed commotion set stubs