Reorg and removall of old reference code