cls: some cleanup