fix or retire legacy system