remove bad merged code from API changes