Code Cleanup:
- Remove unused imports
- Remove useless semi-colon

BMS-215

Reviewer: Mae Isabelle Turiana (Post-Commit)