removed avswitch