Fix for double attriubtes in graph config
Cleanup of old code