MP1-4069 : Fix warning when compiling Part1.
MP1-4069 : Fix warning when compiling Part2.
MP1-4069 : Fix warning when compiling Part3. (Cleanup files)