cleaup circular dependencies