remove null testing