Remove some circular references