Tidy up of GVR file