CLC-2812 - CFV - When Unapplied do something special

https://jira.media.berkeley.edu/jira/browse/CLC-2812