More cleanup of API