Got rid of a lot of unnecessary shit