Added better replacement logic
Remove Backbone in RepoUtils