[Core] Cleaning

* cleaning after catalog removing
* scan tab fix
* other fixes