Fix displaying user and IP in audit log
Fix data cleanup bug