move references to core