Removed the unneeded fields
Committing some old changes. Hopefully doesn't mess anything up.