More CLOP cleanup