Checked through every class and removing unnecessary fields, changing things.