Got rid of unneccessary stuff