APIB update (bodies, clean-up)