JS refactoring. Remove backup