more removal of circular dependencies