removed so much logging