removed lots of junk