1. The existing code works in production and test environments.
2. I think that for development it is OK to ask our developers to clear some database entries introduced by a plugin, discovery plugin introduces a new host type, not only a setting type.
3. Not going to iterate the PR to get it perfect, it's a development mode issue, don't wont it close the PR.