Removed unneeded crap