Added engines stop and comment blocks
Device search code moved to common utils