#91 removing unnecessary fields