Feature/refactor clean legacy

Clean up some ics-openvpn things that were getting in the way or had become erroneous.