clean up api and docu.