cleaned out old images
Merge branch 'pdev' into jdev