wrapper clean up

wrapper clean up