Removed some fields because they are not needed anymore because the view-template was changed.