Got rid of unnecessary stuff