remove some spurious statements, eliminate compile warning.