Tidy up by removing unnecessary local variables
Merge pull request #3414 from lesteve/scheduled-removal-from-0.15

[MRG] Tackle remaining comments in #3411