removing a bunch of seemingly dead apis