remove some unneeded stuff for toro