add missing use
remove unused use statement
remove commented code
remove unused variable
remove unused variable
Merge pull request #498 from lunika/fix

Fix