removed all the extra junk