OCL: code cleanup, fix .clb files