Penultimate EdgeType cleanup