Got rid of unused variables