Reference cleanup for usageTab and graphline
More refactoring and reference cleanup