Adding missing changes
Getting rid of backup files