Removing unused imports and variables
Merge branches '054f_M9_Removing_Warnings_Clean_Code' and 'master'