I removed some dead code from base model implementation.