CLN: cleanup II