removed useless fields