Remove some not used variables
Version 2.2.2