Revert "Additional fields"

This reverts commit 777844fe113d8c55fd06e1bddbc70b6022d7ba47.