remove null safety from helpers