fix: remove null fields