* api cleanup