unnecessary logging is removed
unnecessary lines are removed