remove mockup code
regen for a8a016e