Got rid of more useless stuff.
Getting fancy :D