COSMIT remove unused imports and variables
Merge pull request #2818 from jnothman/flakes

COSMIT remove unused imports and variables