remove dependency on PictureBundle...