Remove unneeded API boilerplate