Removed pretty much useless stuff
Big update!