Fix feature dependency on Portability.
Fix Axis Tools connector cleanup.
Fix Castor connector cleanup.