Database model cleanup