Remove unused variables
Remove redundant commas