On Thu, Aug 25, 2016 at 06:44:19AM +0200, Heiner Kallweit wrote:
> Both elements are not used, so remove them.

Mechanical changes like this are better done before more substantial
optimisations and enhancements like the previous patch, that way they
won't get blocked if there's a problem with the previous patch as is the
case here.