Wye cleanup fix