nodes can now be removed - refactored the broker code