Remove unneeded parentheses and minor cleanup.
Remove unused variables and function members.