Drop mate-base/mate-corba