Detection: Remove `shouldDetect` var