Item13120: some cleanup