Cleaned up the PictureSvcApi