Remove unused variables
Fix imports
remove println
Fix missing If and Else Block Braces
Merge branch 'APD-97-BOZ' into develop