Remove hard-coded checks for specific node details in preparation for adding the checks dynamically