Removed Stubs

Removed un-needed stub case/switches