NVTY-14 Clean up warning messages during build
NVTY-14 Clean up warning messages during build