Pull request to master

remove unused variables po :bow: 
(check all other files for unused variables as well :dart: )