Removed or redeclared unused variables