Remove useless fields and restructure a bit.