- Images and files are correctly retrieved (in page and page preview)
- Removed some unused (commented) code