SF (remove unused import)
LPS-40039 Remove unused var
LPS-40470 Fix deprecation
LPS-39077 Fix NPE