Latest changes + PVE correction
Remove redundant file