Also removes unused imports which were hidden by noqa. Change-Id: I53e0f1ba0b3cdfbfc38716c6af9586f0a68f578d