Got rid of some useless stuff here