FNJEN-35:  Cleaning up the project this commit encompassess tickets FNJE...

...N-[23, 8, 15, 16, 11, 12, 17, 18, 19]