Fix a specification
Remove EQC code