Clean up invariants