remove null guards

closes #39