Remove debug output
Add every other base class