Removed and rearranged fields