Remove some dead code in ReplaceEggs