Database model and config cleanup