Removing unused variables