Got rid of useless stuff
