Got rid of some unnecessary stuff.