LPS-49532 Enable SPA in DL and remove unnecessary logic