Remove temp fix to always show user info
Removing unused imports
PEP8 clean up :)