Remove backup files
Fix duplicate line
Remove deprecated files