Apigen clean up and update.