remove call to stop scanning on destroyed
re-arrange intents between components