Revert "added some stuff so that calendar can get the class id"

This reverts commit 0d3c5e22f36b11cbff8202b9345e3e8d7a376fd0.