Merge pull request #819 from jmaas/master

More code cleanup as result of pyflakes
Merge pull request #820 from jmaas/master

Got rid of the cexceptions wildcard (and unneeded) imports.