Clean up due to RMD vs2