images/cl2: General cleanup.