commenting more funcs out