Update logger to report lines

When debugging the reset flow the logging started to get annoying as it didn't report the files correctly. With enhancing logging it's really easy to screw-up the source of the log statement. 

This change removes what we don't use and fixes the line reporting.