removed unused temp var
todo