Merge: Some cleaning in vm files