Fixed unused imports and 'problems' eclipse found

Not really sure they were actually problems, but I wanted to make sure
everything looked good by eclipse.  Since we will have to be running
checkstyle and all that soon.