Removed velbus-specific things and converted to elco-specific