Cleanups - Add missing semicolons. Remove unused variables.