Simplify and fix check models (#5685)