LPS-35256 Fix bad SF
LPS-35256 2 more places
LPS-37794 Remove main()