removed unneccessary fields