[Core] Cleaning - part 2

* DiscoveryWarning model - removed
* migrations merge
* other small fixes