removing lots of logging