removing fields for addon usage