Removing excessive logging