Removes some shit
Some new stuff