cclive: removed redundant conditionals