Cleanup: Removed unused imports

BMS-119

Reviewer: Daniel Villafuerte