Fix Eclipse warnings * Remove unused import * Remove unused method Change-Id: I4ef40cd4a8201fe07cb3de636c95ba064af8569d