Remove unnecessary flags; Remove old files
Add new files