api, cleanup, stuff