Remove extra chosen code and fix merge issue