Remove unnecessary check
Merge branch 'CE-1030-slight-cleanup' into dev