Removed NOA external dependency - No need to import it