SERENGETI-1883: Fix SCA warnings, compiler warnings and clean up imports