Remove unnecessary invariants