Invariant check clean-up