removed unneeded crap