Removed unused import and commented unused variables.