Api cleanups

Sure!