Tried to remove all unnecessary CODA references