Fix overlong lines, remove unused imports, remove unused variables Change-Id: Ic30640891af5413d57c82a1666f81518168e4a88