Cleanup code for EdgeUtils