clean up api some more