Remove log entries, refactor recording method a little