code cleaning to remove some warnings.