removed lots of logging