Removed dead code.
Address warnings.