Remove more bad APIs