cleanup in graph and table