Revert changes related to logging stuff
Continue reverting