Updated stuff and removed unneeded crap
Updated stuff and removed unneeded crap