remove extending base Yoda classes