Fixed issues minor issues related to dead storage warnings.