First commit does a brief cleanup, the second commit switches from the resourceLock to a ThreadGroup.