Remove distinction code from actions