cleanup
Merge pull request #838 from marcel-blonk/PLFM-2333

cleanup