Got rid of a lot of unneeded things