code cleanup. remove warnings.