cleanup of base model classes