Here's a cleanup of imports. I'm not sure the second patch is a so good idea. Let me know. [PATCH 1/2] cleanup: remove uneeded imports [PATCH 2/2] explicitly define symbols to import instead of 'import *'