cleaning up filevalue and image class