Code cleanup - Unused variables, double declared variables and undeclared variables.