remove some common files, restore others

the restored common files are restored with comments