Merge "Eradicate exificient from the repository"