Bugfix: removed unnecessary fields