Removed the fid parts in edge data structure!