removed lots of stuff