clean imports
correctly updating graphs