[BUGFIX] Cleanup usage of FileReference Model in images fields