Cleanup, trace messages for locking