ocl: code cleanup, fix .clb files