CLC-4482 Simplify Cal1card code
Merge pull request #3123 from raydavis/raywip

CLC-4482 Simplify Cal1card code