44 api cleanup