Remove unused var
Remove unessacary comma