More cleanup and API coalescing