removed unsed fields