Remove no longer working availability checks
Fix NBULog header import