Do as little work in Detect as possible
Merge pull request #166 from heroku/schneems/clean-detect

Do as little work in Detect as possible