Backing out additional unused changes