Remove errant debugging code and bad inheritance