Remove unneeded comma, comment out unused variables