deleted switch client unused imports and changed main common call