rollback to extending of AtomicReference by actor node + code clean up