Added better lifetime control of Sapphire Images.
Removed deprecated files.