Clean up double variable.
Clean up build warnings.