Remove commented out code
Remove unneeded parameter from non-async versions of helpers