Simple code cleanup

 * Fix an exception that was raising a tuple
 * Remove unused imports
 * Remove unused exceptions
 * Remove extra blank lines

Change-Id: I9127be991e9081dc173525c9b57ea297f389d16d