Cleanup interfaces and fix port state issue
9 files changed