removed unneeded junk