drop ProductPictures
mv ProductPictures field to Product for optimisation
some other fix and updates