remove commented code
Migrate from wrapper functions to correct calls