CALM Misc Items Comments -- testing cleanup