removed unused edges
dealt with warnings of udefined variables
simplified some logging messages which were using out-of-date attributes