Error Fixes

Removes Compiler Warnings Including:

Unnecessary Imports
Incomplete Switch Statements