getting rid of lots of API we don't need