[AC-108: Patches] Clean up minor items

[NorrisWu0]

Provide screenshots or videos that the function is working.

Provide screenshots of no warning, error in console.

• [x] No merge conflict with the develop branch.
• [x] Check PR title is correct, (i.e [AC-xx: Feature] Create pull request template).
• [x] Check your app will run without crashes.
• [x] Check if there are hard coded values.
• [x] No //eslint-disable-next-line no-unused-vars, unless otherwise specified.
• [x] No unnecessary spaces between lines of code.
• [x] Check you are using camelCase && PascalCase correctly.
• [x] Check you named your code properly.
• [x] Remove unused comments.