l2: api cleanup