CLC-3610 Simplify cal1card feed structure

https://jira.ets.berkeley.edu/jira/browse/CLC-3610