Got rid of many unnecessary stuff.