Remove unused use statements
Fix CS
Merge pull request #133 from aderuwe/patch-6

Bit of cleaning up in the Common namespace