EDA code fix and cleanup.