Move undertow subsystem off SVH and use simplified api