Fixes for PLFM-2504, PLFM-2498, and PLFM-2503
removed not used file
Merge pull request #997 from john-hill/PLFM-2498

Fixes for PLFM-2504, PLFM-2498, and PLFM-2503