Removed an unused import and other minor edits.

Change-Id: I5e2b70b08566bde8a3972f4c9d951d2491a622cd