XD-2230 clean up per review